Merge NeverType pre-scan into existing flattening loop#5374
Merged
ondrejmirtes merged 1 commit intophpstan:2.1.xfrom Apr 1, 2026
Merged
Merge NeverType pre-scan into existing flattening loop#5374ondrejmirtes merged 1 commit intophpstan:2.1.xfrom
ondrejmirtes merged 1 commit intophpstan:2.1.xfrom
Conversation
SanderMuller
force-pushed
the
perf/merge-never-scan
branch
4 times, most recently
from
eec4924 to
258ec73
Compare
Merge the separate NeverType pre-scan into the existing flattening loop, eliminating the redundant iteration over all types. Also skip the classification loop and inline the dedup for the common case of 2 non-scalar, non-array, non-enum types.
SanderMuller
force-pushed
the
perf/merge-never-scan
branch
from
258ec73 to
7ae06e6
Compare
Collaborator
|
This pull request has been marked as ready for review. |
Member
|
It’s nice, thank you! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #5325 and fe1df1a.
The N>2 pre-scan and the flattening loop both iterate all types checking for MixedType and NeverType. This removes the pre-scan and counts NeverTypes during the existing flattening loop instead. After the loop, a single bulk filter removes them all, replacing the per-element
array_splicethat was there before.The
$hasUnionOrBenevolentguard is no longer needed. UnionTypes get flattened first, then the post-loop filter removes any NeverTypes from the result.The escaped mutant on
!$types[0]->isArray()->yes()vs$types[0]->isArray()->no()is pre-existing — that line is unchanged from before this PR.